Add a more complex widget in the flipping assistant
authorSébastien Granjoux <seb.sfo@free.fr>
Mon, 26 Oct 2015 20:52:34 +0000 (21:52 +0100)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 29 Oct 2015 23:21:20 +0000 (19:21 -0400)
This reproduces the problem from bug
https://bugzilla.gnome.org/show_bug.cgi?id=756385

gtk/gtkassistant.c
tests/testassistant.c

index 91270b9cd395c5ee0b4039370e872d3b74dceedd..b1d400d1c1f0235681a725b2f7aa2ae3e79fd3db 100644 (file)
@@ -1134,7 +1134,6 @@ assistant_remove_page_cb (GtkContainer *container,
     return;
 
   page_info = element->data;
-g_print ("remove page cb: %s\n", page_info->title);
 
   /* If this is the current page, we need to switch away. */
   if (page_info == priv->current_page)
index bfce39921a9ef95a9def5904f062d7de6b1d704a..fec7f69c82b1806edb7317a473a051e0eaad6c86 100644 (file)
@@ -607,7 +607,7 @@ flip_pages (GtkButton *button, GtkAssistant *assistant)
   gtk_assistant_remove_page (assistant, 1);
   gtk_assistant_insert_page (assistant, page, 2);
 
-  gtk_widget_show (page);
+  gtk_widget_show_all (page);
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, title);
   gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE);
 
@@ -650,8 +650,13 @@ create_page_flipping_assistant (GtkWidget *widget)
       gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Page 1");
       gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE);
 
-      page = get_test_page ("Page 2");
-      gtk_widget_show (page);
+      page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      gtk_box_pack_start (GTK_BOX (page),
+                          get_test_page ("Page 2"),
+                          TRUE,
+                          TRUE,
+                          0);
+      gtk_widget_show_all (page);
       gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
       gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Page 2");
       gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE);